Toolbar added and controllers folder created

James Peret 8 years ago
parent
commit
e33644d143

+ 50 - 34
app/index.html

@@ -1,5 +1,6 @@
1 1
 <!DOCTYPE html>
2 2
 <html  class="no-js">
3
+
3 4
   <head>
4 5
     <title>Codex</title>
5 6
 
@@ -13,48 +14,63 @@
13 14
     <script src="../bower_components/angular-sanitize/angular-sanitize.js"></script>
14 15
 
15 16
     <script src="scripts/codex-app.js"></script>
16
-    <script src="scripts/app-ctrl.js"></script>
17
-    <script src="scripts/sidebar-ctrl.js"></script>
18
-    <script src="scripts/note-ctrl.js"></script>
17
+    <script src="scripts/controllers/app-ctrl.js"></script>
18
+    <script src="scripts/controllers/header-ctrl.js"></script>
19
+    <script src="scripts/controllers/sidebar-ctrl.js"></script>
20
+    <script src="scripts/controllers/note-ctrl.js"></script>
19 21
     <script src="scripts/services/file-service.js"></script>
20
-    <script src="scripts/date-formatter.js" charset="utf-8"></script>
22
+    <script src="scripts/services/date-formatter.js" charset="utf-8"></script>
21 23
   </head>
24
+
22 25
   <body ng-app="codexApp">
23 26
     <div  class="window">
24 27
 
25
-    <header class="toolbar toolbar-header">
26
-      <h1 class="title">Codex</h1>
27
-    </header>
28
-
29
-
30
-    <!-- Your app's content goes inside .window-content -->
31
-    <div class="window-content" id="holder">
32
-      <div class="pane-group">
33
-        <div class="pane pane-sm sidebar" ng-controller="SidebarCtrl">
34
-          <nav class="nav-group">
35
-            <h5 class="nav-group-title">My Notes</h5>
36
-            <span class="nav-group-item active" ui-sref="index">
37
-              <span class="icon icon-archive"></span>
38
-              All Notes
39
-            </span>
40
-            <span class="nav-group-item">
41
-              <span class="icon icon-book"></span>
42
-              Notebooks
43
-            </span>
44
-            <h5 class="nav-group-title">Favorites</h5>
45
-            <span class="nav-group-item">
46
-              <span class="icon icon-star"></span>
47
-              Starred
48
-            </span>
49
-          </nav>
28
+      <header class="toolbar toolbar-header" ng-controller="HeaderCtrl">
29
+        <h1 class="title">Codex</h1>
30
+        <div class="toolbar-actions">
31
+          <button class="btn btn-default">
32
+            <span class="icon icon-plus"></span>
33
+          </button>
34
+          <div class="btn-group pull-right">
35
+            <button class="btn btn-default">
36
+              <span class="icon icon-pencil"></span>
37
+            </button>
38
+            <button class="btn btn-default active">
39
+              <span class="icon icon-eye"></span>
40
+            </button>
41
+          </div>
42
+        </div>
43
+      </header>
44
+
45
+
46
+      <!-- Your app's content goes inside .window-content -->
47
+      <div class="window-content" id="holder">
48
+        <div class="pane-group">
49
+          <div class="pane pane-sm sidebar" ng-controller="SidebarCtrl">
50
+            <nav class="nav-group">
51
+              <h5 class="nav-group-title">My Notes</h5>
52
+              <span class="nav-group-item active" ui-sref="index">
53
+                <span class="icon icon-archive"></span>
54
+                All Notes
55
+              </span>
56
+              <span class="nav-group-item">
57
+                <span class="icon icon-book"></span>
58
+                Notebooks
59
+              </span>
60
+              <h5 class="nav-group-title">Favorites</h5>
61
+              <span class="nav-group-item">
62
+                <span class="icon icon-star"></span>
63
+                Starred
64
+              </span>
65
+            </nav>
66
+          </div>
67
+          <div class="pane" ui-view ></div>
50 68
         </div>
51
-        <div class="pane" ui-view ></div>
52 69
       </div>
53
-    </div>
54 70
 
55
-    <footer class="toolbar toolbar-footer">
56
-      <h1 class="title" ng-bind="noteCount()"></h1>
57
-    </footer>
71
+      <footer class="toolbar toolbar-footer">
72
+        <h1 class="title" ng-bind="noteCount()"></h1>
73
+      </footer>
58 74
 
59 75
     </div>
60 76
   </body>

+ 1 - 0
app/scripts/codex-app.js

@@ -12,6 +12,7 @@ angular
12 12
     'ui.router',
13 13
     'ngSanitize',
14 14
     'codexApp.index',
15
+    'codexApp.header',
15 16
     'codexApp.sidebar',
16 17
     'codexApp.note'
17 18
   ])

app/scripts/app-ctrl.js → app/scripts/controllers/app-ctrl.js


+ 15 - 0
app/scripts/controllers/header-ctrl.js

@@ -0,0 +1,15 @@
1
+
2
+
3
+/**
4
+ * @ngdoc function
5
+ * @name domainManagerApp.controller:AboutCtrl
6
+ * @description
7
+ * # AboutCtrl
8
+ * Controller of the domainManagerApp
9
+ */
10
+angular.module('codexApp.header', [])
11
+  .controller('HeaderCtrl',['$scope', '$rootScope', '$state', function ($scope,  $rootScope, $state) {
12
+
13
+    console.log('Header loaded')
14
+
15
+  }]);

app/scripts/note-ctrl.js → app/scripts/controllers/note-ctrl.js


app/scripts/sidebar-ctrl.js → app/scripts/controllers/sidebar-ctrl.js


+ 0 - 0
app/scripts/file-service.js


app/scripts/date-formatter.js → app/scripts/services/date-formatter.js